Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Thu, 26 Sep 2013 07:37:16 +0000 (10:37 +0300)
committerEli Zaretskii <eliz@gnu.org>
Thu, 26 Sep 2013 07:37:16 +0000 (10:37 +0300)
commit2e575f97e7a11a1b250dea865452e5cf3bc319a3
tree229ecaadfc2b5cf3cac6fa0c214239d30b3a87e2
parent3b2cf447b91c0fda80bc35bf2add1cbb72302aa2
parent909b7098e89578c6737beaa12942ff56baa31a26
Merge from trunk.
21 files changed:
configure.ac
lisp/faces.el
lisp/mouse.el
src/alloc.c
src/dispextern.h
src/dispnew.c
src/keyboard.c
src/keyboard.h
src/menu.c
src/msdos.c
src/nsmenu.m
src/term.c
src/termchar.h
src/termhooks.h
src/w32console.c
src/w32fns.c
src/w32menu.c
src/w32term.h
src/window.c
src/xdisp.c
src/xmenu.c